Merge "Update sanitize property format"
am: edbd10348f

* commit 'edbd10348f7260d429b36e971e0d02da8a7378a4':
  Update sanitize property format

Change-Id: If026b2fd13de3529e883a22dc5eba00365932eae