Switch vayacondios to deploy master branch

Change-Id: I09bf79325f70057b304f2405dba8f876d3efd6fa
Merge "Switch vayacondios to deploy master branch" into rc