Merge "Merge cherrypicks of [1487800, 1487801] into oreo-mr1-cts-release" into oreo-mr1-cts-release