Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: f0d0a01dc2  -s ours am: fe550a168b
am: 5428ef8dc9  -s ours

Change-Id: Ifdd3bcdf482314a714730e16c44995e9058ed43d