Minor cleanup and add covers tags in client

Change-Id: I4d079358363dc11a427a87dc3ee10822e1773628
Merge "Minor cleanup and add covers tags in client"