Merge "Fix apct test." into pi-dev