Merge "Add IOmxStore and remove IOmxNode::setQuirks." into oc-dev am: 5af63734be
am: b959f22a08

Change-Id: I8af0492e90905a30dc5721a9da67840e8824afa2