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

Change-Id: Ie423a6769bea6137d2bfa1f49a6d20b6dda76c68