Merge "Handle non-ready provisioning status on non-VVM3" into nyc-mr1-dev