DO NOT MERGE: Merge Oreo MR1 into master am: 6f110bb98d  -s ours am: 045409d78a
am: ffa7a12fd4  -s ours

Change-Id: I9e623b944767679aba0d6b3415ee8a2103ecda99