Fix alarm layout.

Change-Id: Id3d23366267b7111c9643a6163ffa63518db0cfb
Merge branch 'cm-10.2' into martincz