Merge "Add delete key support." into nyc-dev
am: db1f58a

* commit 'db1f58a0a544732025b99c2f3ca03f3f1d995e95':
  Add delete key support.