Merge "DO NOT MERGE - fix AFM.getComponentNameFromContext()" into oc-mr1-dev am: 2eeab61b4c
am: e14921216a  -s ours

Change-Id: I4e485a49a8944c46f3c4ce45040194b6f53195ae