Change PropertySerializer to only include data type if specified by options

Change-Id: If2a4b28c3093f9a94f21ceb553df768ebf6a8cff
Merge "Change PropertySerializer to only include data type if specified by options"