DO NOT MERGE: Merge Oreo MR1 into master am: 3877c1d220  -s ours
am: 79b5a4e950

Change-Id: Ib3dce248f7327148d7a483eb83bfd4ec9c44b947