Merge "add config option for safe volume warning" into pi-dev
am: 5cd354c89c

Change-Id: If90bb4049e307084e6bf3b99fa22e5534826bda5