DO NOT MERGE: Merge Oreo MR1 into master am: 822ef80cb7  -s ours am: b3d9dabb65
am: 2b5a1aab51  -s ours

Change-Id: I8ed9da0ce15f346d8e406596c1d8e77f83714c59