Preliminary support for CMAccount

Change-Id: I6570258828c9a3b4db7f97943123a20ab5ade4ee