DO NOT MERGE: Merge Oreo MR1 into master am: a5d45aa1dd  -s ours am: d10f572af0
am: 9b699fdb99  -s ours

Change-Id: I2db04878a0b2b54344b960f35502cbc08c25deda