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

Change-Id: I224b7782c83bffecea05eaffc1fce57193a51313