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

Change-Id: Ia817d207c37bf8b959ab2fca858e916e1d950a59