Merge "Frameworks: Fix NPE for agent attach" into oc-mr1-dev