DO NOT MERGE: Merge Oreo MR1 into master
am: 3b4a1d7e44  -s ours

Change-Id: I91614998b06905e2b92019661a3cc941a0f8a5d8