Update fs java

Executed samples. No regression. 
Executed Tests. No Regression.