am e329a3ec: Merge "Remove watchprops."

* commit 'e329a3ec1b210d65ea33d67df1928dbffdb1d2d4':
  Remove watchprops.