Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 879d439e26  -s ours
am: 9cfd7f3272

Change-Id: Id1fd28cabad8815dfb80d6b3100d4502c34410d8