Merge "Add serviceaccount support to common and appmgr"