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

Change-Id: Ic1c049bf0947caf5959dfe699f84171c4163b107