Build fix cleanup after locking churn

Change-Id: I61476771c62d9a5dcad432c70676b46fdf216c73