Merge "DO NOT MERGE More OMX struct checking" into klp-dev