Bug 70906: Unlock fails on beta labs

Bug: 70906
Change-Id: Idf851a4977b3acd43e7fd86b13accc4bff92f7da