Merge "Merge "Frameworks: Fix NPE for agent attach" into oc-mr1-dev am: 2437f9f10c am: 87fcf18ac7"