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

* commit '3cc101d606c6a652955c08c6d3e200ed7c56b795':
  Remove watchprops.