DO NOT MERGE: Merge Oreo MR1 into master
am: b15359e4ad  -s ours

Change-Id: Ic3e3f70346ed98ff2c44ef1fb20d0e2c9a742581