Merge "Delete unused timeout constant."
am: 1439bbb6d5

Change-Id: I341540745196f1d23fb95263a8948561cdfa4c8e