Merge "Lock the pulling alarm handler." into pi-dev am: 493bb2b119
am: 2eccd835de

Change-Id: I4c488e49c74021459b4a86ba9d596bed2e2007c1