Merge "[CVP] Fix tools_repo offline usage" into release/proposed/2019.2.0