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

Change-Id: I3bf3b6c9756add68ba7d1944cd671fa2c503956e