Merge "Fix typo in AndroidTest.xml" into pi-dev