Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 22d02e1a04  -s ours
am: dc0b732692

Change-Id: Ib8ccce14ac3a8a0719f026de1af0930dade6f54b