Added javadoc to Drive.
Merge origin/master