DO NOT MERGE: Merge Oreo MR1 into master am: 65fe39d8b0  -s ours
am: 10cd87412e

Change-Id: I91a0feca939e4daaeff42508cf1d67af688d7b03