DO NOT MERGE: Merge Oreo MR1 into master am: 03f7102740  -s ours am: aaa36187f8
am: 13f838c7ab  -s ours

Change-Id: I40370e272ea3ed9c2aaf433a98e748af516071d8