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

Change-Id: I9610cf52b0cba7434e22d70ce8163692f4547668