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