DO NOT MERGE: Merge Oreo MR1 into master am: 67efa21cb0  -s ours
am: 01409a6bd0

Change-Id: I1e1e173150c769d61de69de814fc8f79975e7b44