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

Change-Id: Ide220a539dfb7441ab8dce6f6035a2ff8e436a2e