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

Change-Id: If8f9cfa7aa2ab75b0069cf3c22b3ed4d38795623