Merge "Change alarm client name and tenant name"