Merge \"Unspecified alarm worksource names are the rule, not the exception\" into nyc-dev
am: 4eaaf7c8ff

Change-Id: I21a5ef225a2c6f6693940ee32f3248c01823b9e2