Merge "Fix bug 3425610 Reduce lock / unlock sound level" into honeycomb