Merge "Fix accessorychat test program"