Fix coverage tags for Entity

Change-Id: Ib1415de424fbf5df5e680da185cc6d615fc12da8