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

Change-Id: Iba9f19fd95c5b6fcf1248808b76042f84e203ff3