am 2c00d629: am 727b462a: Merge "Never allow -w."

* commit '2c00d62940e7f88b2168ccf3a29a1d3e84f59bfa':
  Never allow -w.