Get rid of deprecated method usage in SpecialNewProperty

Also cleaned up code a little

Change-Id: Ib96adf2c5864b94869a5531f35d994f5906be768
Merge "Get rid of deprecated method usage in SpecialNewProperty"