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