Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: c8fdc0c131  -s ours am: 569b89e1e6
am: 253041ec3d  -s ours

Change-Id: I9afab39bc9ade45a4c83c51602e28db7a52801ec