Merge "All users will hear charging sounds." into pi-dev
am: e5c9cc124a

Change-Id: I406dde16f874a7b2814270a53efe0458b0c06d52