Merge "matrix: Enforce kernel requirements in OTA only when flag is set." am: 0084639ada
am: 0e193786e8

Change-Id: Icdd6ae9a045e801806fdfd449f7d36fd8f50c7d3