NXCM-5194: Getting rid of Java7 signatures