Merge "Change tests to be instrumentationTests everywhere."
Xavier Ducrohet [Tue, 19 Feb 2013 19:49:27 +0000 (19:49 +0000)]

Trivial merge