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

Change-Id: I91bc58bf99a1834821f88aeee3f1ce99da9861e5