Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 350f920753  -s ours
am: edb2373362

Change-Id: I3be76a44c0308df386d284dfca0022dc7fd890b6