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

Change-Id: I46643853ff82dd7fd90d463a9015f68b9d8e7d1b