Bring back symbol picker functions

Needed changes in frameworks is now merged and will support that.

Change-Id: Ib396dd85cfb9d5f48cfa6fdde23f08229d677e18