More checking fixups

Change-Id: Id3bbe5a5a99399f465cb748cc3d06001538a91a7
Tweak gklog to add to existing tokens

instead of just replacing them.

Change-Id: Iaa40d192e9e521dfd0baac885a8f4439020b9698