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

Change-Id: Idbcaa08b7255c8d2dfd7d2bae42fe1daf3c12bf8