Merge "Fix cgroup support for recovery mode"
am: da20bc763e

Change-Id: I123397885ee61abe8c163eaaabe72fc8925baa60