Merge "Use less static synchronized" into jb-mr1-dev