DO NOT MERGE: Merge Oreo MR1 into master
am: d1a6d1eb81  -s ours

Change-Id: I905dcf93fd94015d9da17999dd52f4ea9d8f36ae