GPS and Voice Search key fixes

Change-Id: Ib2f61dabd4071ce3de677545502cf7490f898d20