Merge "Increase timeout for loading archives in tests." into arc-apps
am: 63678d9b1a

Change-Id: Ic797710a7819a874053892070c3d90147176d76a