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

Change-Id: Iad98f059fd3a15a7bd5dffa1c53300340e3f9e19