am c41dca14: Merge change 21045 into donut

Merge commit 'c41dca14ee9a9513e547a54a6356b4dab41d781c'

* commit 'c41dca14ee9a9513e547a54a6356b4dab41d781c':
  Last minute change: Replace default app icon with a prettier one - droid on a software box sort of thing. :)