Merge "Fix AndroidTest to be ready for apct-suite" into pi-dev