DO NOT MERGE: Merge Oreo MR1 into master am: 3843fde190  -s ours am: 49b230093a
am: 388c7aba6d  -s ours

Change-Id: I1d2ed20c8902399a8c12bcd251ea34be82f1cc40