Merge "update telecom test apps directory (NPE & RoleManager)" into tm-dev