DO NOT MERGE: Merge Oreo MR1 into master
am: ece867c88c  -s ours

Change-Id: I7c175a5667aec3d3d9bab5b0fb29769caa249f85