Merge "release-request-69c3d750-179e-4af1-8ebf-e4da96f77bc9-for-aosp-nougat-cts-release-4338754 snap-temp-L18100000103152257" into nougat-cts-release