Merge "release-request-c10e71c1-ae23-413c-809a-e424390ecbdf-for-aosp-nougat-mr1-cts-release-4369596 snap-temp-L36500000107927032" into nougat-mr1-cts-release