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

Change-Id: I38524b1e8e2e8d32e6371dddefe50ea84f876ba6