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

Change-Id: I0e71405251a411ac0c6e01fa1cb9646884b9414c