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

Change-Id: Ibe38576f5bada20131d05e550d93f6b6be54179f