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

Change-Id: Ibae9f17cb6415ec07b08d35b45d6b414b3a1ba83