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

Change-Id: Idda0d7fbc0f63bcbad44da6a46cef786770a2851