am ef2d1555: am c627f642: am 9a6ff5dc: am c7d41589: Merge "Use private object as a lock instead of synchronized method"
* commit 'ef2d15553babb9236dc53373c8750281a65ab46f':main
commit
7d4f0961d4
* commit 'ef2d15553babb9236dc53373c8750281a65ab46f':main