Merge "Merge cherrypicks of [740838, 740839] into oreo-cts-release" into oreo-cts-release