Merge "keymaster HAL uses "default" service name"