Backport nowarn advice tweak
Backport nowarn advice tweak

scala/scala,scala/scala,lrytz/scala,lrytz/scala,scala/scala,lrytz/scala,scala/scala,lrytz/scala,lrytz/scala,scala/scala,lrytz/scala,scala/scala