PS2: inline hasGms usage, don't use addprefix for a single entry,
     remove unused imports

Change-Id: I1eb1fb76e4b80e26992599e3511d265abbfa1cd7