DO NOT MERGE: Merge Oreo MR1 into master am: 2e44794cc0  -s ours
am: 3fe15ac110

Change-Id: I7e64f4fd37776b77cbefd7f60fa8329f6d018fc1