block: row: squash commits from codeaurora