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

Change-Id: Ic9f71e64e95e5d07870cf393c5c02bc312472110