Merge "Update sanitize property format"
am: 0652728

* commit '0652728e2aa101d066600e50f0c91555bd03bf92':
  Update sanitize property format

Change-Id: Id697be990e9a42ad321fc9be885d88ae453ccfc8