Fix mnc-ub-dev branch build breakage in VDC test am: 9b0371b am: 88bd43b am: 4146d3c73d
am: a5ce6ccda2

* commit 'a5ce6ccda23765a3940392a518ac35480d6e9522':
  Fix mnc-ub-dev branch build breakage in VDC test

Change-Id: If0680cf03452720a29c7f4b0e9707247a7275b5b