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

Change-Id: I4d8f0ee2381f5833d7c000a3309d0bda56df71bd