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

Change-Id: Ia77d5a383c8413ac6f9bd8edd0acc955796ccec9