Merge "Revert "Increase timeout for getStringValue to 5 minutes."" am: 1c750dfe am: 6f0723cf am: 1eeb33e4 am: a96eb47a Change-Id: Ibedd5f00117040aa3254c11776ab17ceb8a0385c