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

Change-Id: I2ff7784cf2e3699826c44582e7951d14db450fa8