am 327549f9: Merge "Fix issue 3408285. Fix issue in Thread safe in Java." into honeycomb

* commit '327549f9961b8cd562d1a92c1455005672aa2b95':
  Fix issue 3408285. Fix issue in Thread safe in Java.