Merge changes from topic 'cpuset_setall' into oc-dev
am: 0af7ee4a1f  -s ours

Change-Id: I7a9a38c082010980ecd4f038ad71f9d6ccb94d30