Merge "Update sanitize property format" am: 0652728 am: 9ba3f6d
am: c4dcc38

* commit 'c4dcc38e44a28d91922def85b1ff95802cdf50f7':
  Update sanitize property format

Change-Id: I6ba9b2b80adb9acd8ffd936ad4fbd3d3c9c85f4f