- Add a thread lock Fix: 286495550 Test: make pass Change-Id: I72877551bda18cf93734d270770a0bd53bab465b