[automerger skipped] use lazy android device registration am: 65f31088e1  -s ours
am: f7ec18facb  -s ours

Change-Id: I89e8210e8b9fb073b2d6de33ecbbb9323fb644e2