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

Change-Id: I59e26973945ca6dfa69743e70a141fd93c4465ed