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

Change-Id: Id40bebb0c7b4b0f5cb50bb0003ae554c35943f72