Merge "use lazy android device registration" am: bb4f3eabb4 am: b2dc8babc5
am: 52b98fa38f

Change-Id: Iae15c1a9e46f3d891f3e182920ad41aeb090b3d8