Updated a few method signatures to return the correct type parameter wildcards.

Issue: FMA-55
Change-Id: I38dfa113082124ae62b4fdd5de278409547f10d2