Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: d18ed49f9d  -s ours am: 3aafa4c9ce
am: 9c8ee081e1  -s ours

Change-Id: Iba7fa3c7c0a70e34f97b408fe5b58187b1e433ac