Bug 390396: retain source-level compatibility with Java 5

Change-Id: I2fdf5a0871004f5a03d3307d8b797c029fc2a45d