Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: dd5e6e374c  -s ours
am: e1ecb7605b

Change-Id: I56afc34633ff6c96653726bc754607c163c126dd