Merge changes from topic "cgroup abstraction layer"
am: faa6c4894d

Change-Id: I0d545daaaa0a20dd2e605f1a4be9a1ae9e3f02d6