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

Change-Id: Ic4b4c468787b5a680e40d8bd915865cc4571ad92