Merge "Update volume logging" into pi-dev am: 259bdbf43d
am: 1691d42e1a

Change-Id: Id322f1123c1f430c809f7469d3435def9375df3a