Merge "[pm] remove some lock errorprones"