DO NOT MERGE: Merge Oreo MR1 into master am: a19691092a  -s ours
am: 87b25ad171

Change-Id: Id0fe2b639aeb9c81d69b7603cf265569b711680e