Javadoc but code clean up is required
Authored by: samantprajakta 2014-04-22
Parent: [r2035]
Child: [r2037]
