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

Change-Id: Iabd8d07c4007f802c690fbeaee9edc24dae51842