Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: f45dd18165  -s ours
am: 2f145f3050

Change-Id: I94421d0f6934359169444b4b0d3d8d15b05627b8