[automerger skipped] Merge "Apply initial settings for blkio cgroup" into...
[automerger skipped] Merge "Apply initial settings for blkio cgroup" into qt-dev am: 9d97b88e -s ours
am: 55062d99 -s ours
am skip reason: change_id Id28d9619fc2fd2287fe656b8032025184ae7f631 with SHA1 a8aaf198 is in history
Change-Id: Ib083b3022641b7fc3bc67349f454717cb081dc5a