Fixed the method signatures ofr the fill methods.

Issue: FMA-57
Change-Id: I3367a676d743da29b52a9d9fe5eac7b5313a3ac9