synchronize changes from fog master
some little changes to pass the tesrts
Merge branch 'google-cpi' into google-cpi-microbosh