Merge "Hide retry button from layout." am: 4d00e540eb
am: 697248f628

Change-Id: Idd56977788c6aed527193e36abb436277319f12f