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

Change-Id: I779c4da2aedddd09f86df570a1636b0854d35bbd