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

Change-Id: I9a44273f147a578d6d363bec240b71966c79fade