block: row: squash commits from codeaurora.

thanks to franciscofranco