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

Change-Id: Ic247eef584f48c25dea926615ee4895c1fdb9e58