Merge "DO NOT MERGE: Merge Oreo MR1 into master"
am: 5d66dfc3b3  -s ours

Change-Id: Iaa3fd730791f7b21b47e3bfffae0a964e34a16a4