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

Change-Id: I61cda59e2309c4216d057a3b36898bc307c5ec79