Add CMAccount back to build

Change-Id: I4c7327d9534aaf9e34f3d3d9a8f0866ce5648480