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

Change-Id: I8b616501dc78da2557d5c424698409690cfa5a9a