Fix user profile block and add gerrit_id field

Change-Id: Icb066f967239903a63e5f7c86664bd76df90583e
Merge "Fix user profile block and add gerrit_id field"