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

This reverts commit b18fe4f74a2e84aa8aa3537ea50b31d2b8452d81.