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

Change-Id: Ifcd4d526f1a3d0b96af569f039836f5c82076974