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

Change-Id: Icbf23cf0b7f417723eb7eab25ccf252edc998635