Merge "Restore kernel requirements for frozen matrices." into pi-dev
am: 8be536f364

Change-Id: Id6c5d3ead2170e870ccd64cade82d15cdafb6434