Hardware key fixes

Change-Id: I8628b3478be74b80151ec26c5c3cd937d4da1896
Fix for VoicePlus

Change-Id: I9884b03d248ff595fc86e1703a9ec115f8314c8e