Merge "handle NullPointerException in cases where a proxy call to AdapterService is called after Adapter Service is stopped." into jb-mr1-dev