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

* commit '7a6ccb87290f12203e00cbddcffc2fbee35cebd3':
  Remote volume changes