DO NOT MERGE: Merge Oreo MR1 into master
am: 458d7f1d06  -s ours

Change-Id: I41a68fed8d4f678f36681e8cbe36b7a1b63085ca