Merge "Upgrade python/apitools to v0.5.28" am: 96080f2679
am: 45195c439e

Change-Id: I72a94c1bb240063e2c8c876bf17f596d1fdfcc38