Merge "Add DroidDocs to Events class"