Merge "Fix a typo in AndroidManifest.xml" into pi-dev