Merge "block: row: squash commits from codeaurora." into jellybean