DO NOT MERGE: Merge Oreo MR1 into master am: 44f64ea4bb  -s ours
am: b4c38568a5

Change-Id: Iddb48df011a18a1ed5e2e282ea04dae12fcbed1d