Merge "release-request-947671a0-00af-456b-a62c-687221ebfb00-for-aosp-lollipop-mr1-cts-release-4256994 snap-temp-L90000000091012259" into lollipop-mr1-cts-release