Merge "release-request-7a52500c-393f-4b00-a617-5b5766176532-for-aosp-nougat-mr1-cts-release-4299598 snap-temp-L75900000096867734" into nougat-mr1-cts-release