Silence javadoc 8 errors

Change-Id: Ib0b2286669d797708b30bf0fffdbe14c14d1e30d