DO NOT MERGE: Merge Oreo MR1 into master am: 86a2700e05  -s ours
am: 94cd234a34

Change-Id: If53f2458ffecceba676150c2ec4518802769f399