Revert "block: row: squash commits from codeaurora."

This reverts commit f6a027821ad871abe0a0e00cbef3953f5cccebcc.