DO NOT MERGE: Merge Oreo MR1 into master am: b3de24547f  -s ours
am: 9cb9439e79

Change-Id: Iad93b1edefd2b96ef016fdd720a43e20bed5f791