am 95ccd875: (-s ours) am d93f4e5b: Merge "DO NOT MERGE Doc Change: Javadoc for test case classes" into gingerbread

Merge commit '95ccd875824e640d0958c2fb6715a8edb783d41a'

* commit '95ccd875824e640d0958c2fb6715a8edb783d41a':
  DO NOT MERGE Doc Change: Javadoc for test case classes