Update sanitize property format am: 75720b6 am: f779f15fb5
am: 8c22847c9d

* commit '8c22847c9dd6d34d823bb9cc88e37fd15cc97628':
  Update sanitize property format

Change-Id: I16bf84335b222150b32ed9b3494678ae994088aa