DO NOT MERGE: Merge Oreo MR1 into master am: 86b02b72a0  -s ours
am: 5e6279d25d

Change-Id: I2991a335075e04f0cb567ebed95aae1be05df39f