am 45163044: am 1502d977: am 12e77de2: Merge "Use private lock object instead of synchronized method"
* commit '45163044364ec25186da1cb4098d528d756919d4':main
commit
4490531676
* commit '45163044364ec25186da1cb4098d528d756919d4':main