Fix header and Javadoc issues

Change-Id: I171067273aedc7248e9c044bea0ebf67155fd7a9
(cherry picked from commit 27f6503eb1a0fedf504559e6f6609a6dff80637f)