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

Change-Id: I69474f8e14d6abd2657b1fe9c587fef117df38ec