Merge "Update sanitize property format" am: edbd10348f
am: e4e99a3731

* commit 'e4e99a3731619492ec1882fd85e63f1b76988fb2':
  Update sanitize property format

Change-Id: Iec91b0be95385b7f7577492a43f6197ade627b80