Merge changes from topic "volume-change-flags" into pi-dev am: a88cf78009
am: ab6758a0a4

Change-Id: Ie1e295aceeb8d594e5ed1e7563c834dd07cdafd2