Inter/intra matrices are the same. Reduce the dimensions
of the various matrices.

Change-Id: Ie5049af9195d9c48b6928143ac04ac0a5058d0d8