Merge "keymaster: provide instance name to getService()" into pi-dev