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

Change-Id: If0f1227681db47420025c595447131cea71cf461