Merge "Update sanitize property format"
am: 68bb6e4

* commit '68bb6e47a6bcf144720ea9dd0ce3faa50fbde037':
  Update sanitize property format

Change-Id: Ifea6f4c5fa7b1edbb89becb9651d3d1e791d8d6e