Commits on Oct 28, 2015

1. Fix missing annotations.

   

   tintou committed Oct 28, 2015
   d82e3f7