Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: b6d5778700  -s ours am: 6394d1ed90
am: 0764bff018  -s ours

Change-Id: I9d144396fc5d8e001b72f1b0d334b29006e16542