DO NOT MERGE: Merge Oreo MR1 into master
am: 777f94aede  -s ours

Change-Id: I63b6d8bc72e340102f75f00013894e117b4a5687