Merge "Fix zipapex test-bot."
am: 9e72ebe9cb

Change-Id: I852a894f95a58636580c9dbc9fd203a5c1ce3e4e