am 7ff9436: Merge change 911 into donut

Merge commit '7ff943673e48a912eb7cc5add08e206c2c25d68e'

* commit '7ff943673e48a912eb7cc5add08e206c2c25d68e':
  Debug: Add setPropertiesOn(), and @hide it for now