add ,upadate ,orientation and contact with multiple numbers related issue are fix and code clean up

Change-Id: I08329dca46d75a6fae2fafa51672834b8faf34c4