Merge "GM2 icon updates" into pi-dev am: 733a4b9948
am: 5331f1982e

Change-Id: I2a5caaf344caefd78e28decead9e54a06d1d6111