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

Change-Id: I96c5c4ac9c43b873c343be767a7cbb06d512c395