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

Change-Id: I3142a391bfb28388c16a63be8df5352ecb03913d