Merge "DO NOT MERGE: Merge Oreo MR1 into master"
am: b189caf1d7  -s ours

Change-Id: Ib0efe0678aed4f353b8e7a1ed3caf93b3c7c6003