Merge "use lazy android device registration"