Merge "DO NOT MERGE: Merge Oreo MR1 into master"
am: 6e9db34e73  -s ours

Change-Id: Iade198360cbd966d01c327baa8bbc5c5b83b5563