[automerger skipped] Merge changes from topic "cgroup abstraction layer" am: faa6c4894d am: e419456f89
am: e144770940 -s ours
am skip reason: change_id I213a5f9b02f312ba1dd7dc91c89b67334fb939b9 with SHA1 a76780d627 is in history

Change-Id: I4885c8bb9afd4eb5a3ff504ce1b38f8548eaadbc