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