Merge "GM2 Icons (3 of (?3?))" into pi-dev
am: 6433ac13bd

Change-Id: I29d49b190afa0e5309b1af956216cee0fd22592b