Refetch manifest/matrix on error. am: 2cc413fe20

Change-Id: Ia50be9691e34e2c7f332be2058d7bbcbd5048f45