Merge \"Update Sim toolkit icon to material design.\" into nyc-mr1-dev
am: c930d38729

Change-Id: I9a4f59ff64f10a81c07b05e25c4242ff59ad49a4