Bug 897940 - Extend timeout. r=hsinyi
Bug 921422 - B2G RIL: include clientId in async messages from RadioInterface to RILContentHelper. r=vicamo