Have PropertyValue return the value is contains in getValue rather then itself

Change-Id: I9910ef775f5b25e1fd8b471c5ff4a77be9465ee0