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

This reverts commit a45ce3c2de7caf111a7979e6ace77379ecda9cf8.