Merge "DO NOT MERGE: Merge Oreo MR1 into master"
am: 9c56330ccc  -s ours

Change-Id: I29babab56dcd22dd9107279d1dc46a8b63f4d9e7