[automerger skipped] Restore kernel requirements for frozen matrices. am: a6a1e0b2d2
am: 1ccbbf3eaa  -s ours

Change-Id: I7ebac7a9ee0c26d88a7d40e5f25a3e3fcd4ac87e