Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: dedff1ece6  -s ours
am: 70f12c5582

Change-Id: I9a5c52b3d11c61aa2875e3ed86175a83d2a77d8d