am 09872a35: am fb059f3c: am 7a6ccb87: Merge "Remote volume changes" into klp-dev

* commit '09872a35cb09fc8dbe97d443d083d6c5b0948b90':
  Remote volume changes