DO NOT MERGE: Merge Oreo MR1 into master am: 0b15aab5e7  -s ours
am: 8571abffad

Change-Id: I226d9e0750ccae6756f2f0f6c08e7d13d4bc7c79