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

Change-Id: I632ac4d7b22928b78579ccd6e99a17c516f18809