am d1f0947a: am c6a5dfd8: Merge "Fix bug 3425610 Reduce lock / unlock sound level" into honeycomb

* commit 'd1f0947a609c492b4e96b41aa1cf055bc7603220':
  Fix bug 3425610 Reduce lock / unlock sound level