Merge "Apply initial settings for blkio cgroup" into qt-dev
am: 9d97b88efe

Change-Id: Ia903db4af0fe9c114b0e173de970419860eacc41