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

* commit '7815d4fe67059eabe14541c4fd0fb5e095e0d6e0':
  DO NOT MERGE More OMX struct checking

Change-Id: I65253d21953d213de29c5f9f1a822292e64502d4