Merge "DO NOT MERGE: Merge Oreo MR1 into master"
am: 3c5bb65710  -s ours

Change-Id: I3edf9d4c020c8ecf476e6fb43f0689163744afcf