am 67c750b7: am 3cc101d6: am e329a3ec: Merge "Remove watchprops."

* commit '67c750b7e04796779b010d913286e2f3aba9ae2c':
  Remove watchprops.