Merge "Update timeout string" into qt-dev am: dc1b2cbcda am: b772f10a07
am: 1f63d23e89

Change-Id: Ibb0a9b1699fa5c1beb5577386de73bc4f8aa534c