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

Change-Id: Ia2acf9094ff65f7417593e425fcbe27f60de0a6d