Merge "Merge "Add a null check for the thumbnail image for transition" into...
Merge "Merge "Add a null check for the thumbnail image for transition" into nyc-dev am: 2ff157c0 am: f1aa5bfa" into nyc-mr1-dev-plus-aosp
am: 8755621f
* commit '8755621f':
Change-Id: I7746b2bc869ec2df0424ce4b0fdabb8a2542f6d9