Merge "release-request-4021e6ae-031d-4d22-801c-2cdce1f0700e-for-aosp-nougat-mr1-cts-release-3994449 snap-temp-L72100000062559347" into nougat-mr1-cts-release