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

Change-Id: I1d1810f26265cd93343e8fa09ea7bfc4744581fb