Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: a3e0aa5f25  -s ours am: b9fc83e0e9
am: 9864473fde  -s ours

Change-Id: I4b949aca22cc3af4afae998a4d1845d113dd62a2