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

Change-Id: Ide80325d76a65ff630b2583cc3a816820a2cd054