Merge "Support flags for volume change callback" into pi-dev am: 3b1fa920a7
am: 7ab32606ba

Change-Id: I81255eeec9c9c940ccaebf5b7556b66bf362197a