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

* commit 'fb059f3c412733d962f99577f097e91c2badb10e':
  Remote volume changes