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

Change-Id: I8fb064569f0ee4a4a53949cf39bd35ab34f49d8d