Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: b16ce3146b  -s ours am: 3eb86245f3
am: 39616d1087  -s ours

Change-Id: I828374f46da93bebcf330aebf74c49f6c0a16348