Readd CMAccount

Apparently removing this causes the first run wizard to crash on clean flashes.

Change-Id: I9c743981c2f5a7f7bd2ad48fd88622d2e1531535