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

Change-Id: I4204e7c1b5409325295c193e92deadd5339bff3a