DO NOT MERGE: Merge Oreo MR1 into master
authorXin Li <delphij@google.com>
Wed, 6 Dec 2017 19:51:52 +0000 (11:51 -0800)
committerXin Li <delphij@google.com>
Wed, 6 Dec 2017 22:24:46 +0000 (14:24 -0800)
commit5afbb268c48682b098ed31426fdcfa95d246e136
tree2eb12bc3e7fc052f141e6f83701ab71a02cc3709
parenteb88a8ca3d483f539f09a8a60d81219a8ec0b5cc
parentb1e9663a56e18f0cdffa3280a6c28c77c013cca1
DO NOT MERGE: Merge Oreo MR1 into master

Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: I71216cb23c2124938de9ae2a75b7cd7a0811d57f