Merge "Suppress the first volume adjustment" into pi-dev am: 0a26fb517c
am: dcf1baa7e9

Change-Id: I57bde2e15301abe435db6c12401ef8c662e1af40