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

Change-Id: I0d4d90c2b23d0b7e194b7be6c9a32f75d6e52a0d