Merge "Apply initial settings for blkio cgroup" am: 9243da9008
am: c78c3be5cf

Change-Id: Iae287bef4afefc27e5f52d86234a46e698f172ee