PS2: inline hasGms usage, don't use addprefix for a single entry, remove unused imports Change-Id: I1eb1fb76e4b80e26992599e3511d265abbfa1cd7
Change-Id: Ia3dfa3190b08fac70de2fe088da419d96b0ffa9e