Merge "Merge cherrypicks of [1676040] into oreo-mr1-cts-release" into oreo-mr1-cts-release