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

Change-Id: I60a2557ccab2873a3d2696698f6632188d6cffde