fix row arguments

Change-Id: Ibad189b45c0cd379ea61ae4a78d0c8a094159e37
Merge remote-tracking branch 'upstream/master'