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

Change-Id: Iaec8a3c0a5ad79e6f551d81788524e56adbdf765