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

Change-Id: Ie7f861c8ba9eca256bfdd1546a3a67ae943cea4d