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

Change-Id: I742b33bf1331cf6b3446e98a63d47dd30a92b0b0