DO NOT MERGE: Merge Oreo MR1 into master am: b8a0b93816  -s ours
am: 8314e54802

Change-Id: Iaf2bd0a3b5da5b2187715b5e9d3760e0470d11fd