Merge "Add cpu-set properties to serializer test"
am: dc2f874ed3

Change-Id: Ieb6382dd30f99c77e07362e48a10d2047a78d176