Lock, unlock expect objects

Change-Id: I7dcca379871be4ad2c7747905726842463029246