DO NOT MERGE: Merge Oreo MR1 into master
am: cd5ad4f08f  -s ours

Change-Id: I6ad53b15c5b885df354cc3040877408d74c9920b