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

Change-Id: Ic2de5c2be637e44227bad666998d08cb5bc48ddc