Merge changes Id1109157,I44343a72

* changes:
  Remove spurious @hide comments.
  Remove spurious checkThread() method