Merge "Delay vold connectors until published, fix NPE." into nyc-dev
am: d974605

* commit 'd974605c733d5121a0415edefac27e17c2a36dcd':
  Delay vold connectors until published, fix NPE.

Change-Id: Id0d978eb023635b27d3edfae2a6699b5955be7bc