am 7b548aad: am 22604fe1: am b5e0657b: Merge "Fab for clock app" into lmp-dev

* commit '7b548aad495156a56111dfaf2d62ecddbe831e6f':