Merge "DO NOT MERGE: Merge Oreo MR1 into master"
am: 64a43efc26  -s ours

Change-Id: Ib724e60c79fe39edcc550a4135e0618d9d3caafa