Merge "Don't call into phone process with lock held." into pi-dev