Merge google-cpi branch with google-cpi-microbosh

I've created this PR to track changes between this two branches.