Merge "Fix few NPE in TAPI implementation"