am 8c3616d1: merge from open-source master

Merge commit '8c3616d152bdc2e57836a501632e52a1c5a3cbe9' into kraken

* commit '8c3616d152bdc2e57836a501632e52a1c5a3cbe9':
  adb: remove obsolete shell history support.