Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 22f3402d64  -s ours am: 398cceacb3
am: 2d77f53f84  -s ours

Change-Id: Ia31590a15ed8fd1e15c13cb121c14261bcc14560