Unfortunately not. We still do not have short-term plans for using normal & bump maps with static baked lighting (more info in this post: Normal maps in Shapespark - #4 by wojtek).
The water material already uses normal map, because in this case the dynamic lighting (reflections based on light probe images) is prevailing, so they work well even without static baked lighting support.