Explicitly calling out 1.5 compiler
(cherry picked from commit e6b289b81ceec778d56280312d3b18f5a15d3f43)