Merge "DO NOT MERGE - fix AFM.getComponentNameFromContext()" into oc-mr1-dev