Merge "use lazy android device registration"
am: bb4f3eabb4

Change-Id: I58b3a456dab8327ca40d83b27135210415496af8