Merge "Update sanitize property format" am: 68bb6e4 am: b132bdd am: c0e584ee5d
am: ecf8efbde5

* commit 'ecf8efbde5d6fdbf5ba3b78442ce01197c78e9ac':
  Update sanitize property format

Change-Id: I454e34a431ae6b62fead29fb9bce8fef93dc80c5