Merge change 6912 into donut

* changes:
  JavaDoc for SearchableInfo.getActivityMetaData()