Merge "release-request-6ccab32c-8a06-4337-8cfa-d03fdfedb04e-for-aosp-nougat-mr1-cts-release-4338825 snap-temp-L84500000103155287" into nougat-mr1-cts-release