Merge "release-request-ca95f30c-f1b3-4d9a-897a-3899777c5101-for-aosp-lollipop-mr1-cts-release-4180142 snap-temp-L43700000082406251" into lollipop-mr1-cts-release