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

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

Change-Id: Id1efa0ef28deb8246d624ce928d75893155e84dc