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

Change-Id: I3c0076255f5026befc46024a755b6bf64274f267