Merge "Fix issue 3408285. Fix issue in Thread safe in Java." into honeycomb