Merge "use lazy android device registration" into pi-dev