Merge \"Include an app icon.\" into nyc-mr1-dev
am: 3d8c9981b5

Change-Id: I4a7e591d776097a3e30fa33cb05fe039a562b120