Replace legacy non-Javadoc comment with {@inheritDoc} Change-Id: I3cf468b60ba4bfb8e948a17681cd6ab91df62f2a