Merge "Clear calling UID before resolving intent types." into pi-dev