Fix header and Javadoc issues

Change-Id: I171067273aedc7248e9c044bea0ebf67155fd7a9