Added alarm specification as well as many other improvements.

Change-Id: I29f98a55b149d9ee730230e85c3a335171cfe2cd
Merge "Added alarm specification as well as many other improvements."