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

Change-Id: I4868574523ee2f549da9163ccb571e49e1f68ed6