Merge "Instead of hardcoding OMX component names in our code, support"