Use less static synchronized

 Bug: 6482144

Change-Id: I86161e3298101c10a112add406615001561e649e
4 files changed