Merge "Dump IOmxStore" into pi-dev am: fc39aedb57
am: 4a01b447ea

Change-Id: I03d687c6fdb2583f0fa0d71418e77ce29708f82a