DO NOT MERGE: Merge Oreo MR1 into master am: 9490ad1f69  -s ours am: 8f1c96db39
am: de47f7bf31  -s ours

Change-Id: I6e8453e077fbeed1be968f99028e98b6961d3544