Merge "Add exception handling and retry when configuring VVM." into nyc-mr1-dev
am: 82abca0fc7

Change-Id: I84d99843d5614a09901f2c08611d85c8c7ea2481