Merge "Use UpdateLock"
Daisuke Miyakawa [Tue, 6 Mar 2012 01:04:59 +0000 (17:04 -0800)]

Trivial merge