DO NOT MERGE: Merge Oreo MR1 into master am: f80c4e5911  -s ours
am: 472b742ca9

Change-Id: I0aa39727f1bc41e5cbec97aafd39b17aa17369ad