Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: cb1056f9b4  -s ours am: 4f83509810
am: a038fb9044  -s ours

Change-Id: Ibfdba393783ac392dde8a42418b3cf8bfc8e34ff