Pull in commits to stabilize CI

Our CI system seems to be pron to some timing errors, pulling in
fixes for two of these should give us some improvements while we wait on
the fixes to merge upstream.

Change-Id: Ia50953d2a1cb21dc94787660cd66019239b64ece