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

Change-Id: I64a4395210c5a340ca2bcf85ff3e3de35f01b293