Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: c3c1ae81aa  -s ours am: a18b19b39c
am: 2cae880b17  -s ours

Change-Id: I45871d5a74fece85fd48b88c4e25f6b8951f6959