Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 92c16a1393  -s ours am: d4f56f6416
am: bb839ac14c  -s ours

Change-Id: I64f8fad32eecc70cddced78146ec4f052a4fc323