Merge "DO NOT MERGE More OMX struct checking" into lmp-dev am: a3c7788  -s ours am: 3127286 am: 9385896 am: 7815d4f  -s ours am: 2b62ab3
am: cacd04d

* commit 'cacd04d188d5abdb625371572ccd9b4983fe3dd0':
  DO NOT MERGE More OMX struct checking

Change-Id: Iacbf0ad0e46a5340fa50210f10b18847c2ce307d