[automerger skipped] Merge changes from topic "cgroup abstraction layer" am:...
[automerger skipped] Merge changes from topic "cgroup abstraction layer" am: faa6c489 am: e419456f
am: e1447709 -s ours
am skip reason: change_id I213a5f9b02f312ba1dd7dc91c89b67334fb939b9 with SHA1 a76780d6 is in history
Change-Id: I4885c8bb9afd4eb5a3ff504ce1b38f8548eaadbc