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

Change-Id: I3dcf1fdfb834bba6b7c7e33a655226e9fffb6922