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

Change-Id: Ie68c6c3781b34c2390c6510e2909a999514f75ed