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

Change-Id: I4d18584f82a418d9b8f7288f509d53ac341d777d