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

Change-Id: I3f9a8fb984caf817f6e8751c0f441aaee0902115