Merge "Merge "DO NOT MERGE More OMX struct checking" into klp-dev am: c002126cb0 am: e25ff0130e am: f54f5b54bd  -s ours am: a79dd03ce6  -s ours am: 4567d7b780 am: 24bb5389ee am: ee8c091aea  -s ours" into mnc-dev am: 0bbfc1a781 am: 8aa3c63 am: acc06d4
am: c4cfcb9  -s ours

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

Change-Id: Ie45a636373e2a34584ec1a25034858a2358c37df