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

Change-Id: Ib2d9175c76ba02d8f0699cbcf58a927ce6837825