DO NOT MERGE: Merge Oreo MR1 into master am: ab8acf613c  -s ours am: d6130ea82b
am: 27dc11bc04  -s ours

Change-Id: I301d9326ea977238e518c06f3416d742da695b90