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

Change-Id: I77bddcf877f40cc64fd67369edb8897f31917ba9