Simplify synchronized code and add comments

Test: N/A, by inspection
Change-Id: Ie08ce51ee6736a6c1df18783dd5ed064288907e1
1 file changed