Add compatibility code with mainline's configuration options for unlock

Change-Id: Ife2d6fad5cb1e7c846f5969401ee6dbc881aea3f
Revert "Fix Objects references"

This reverts commit 1e3fe0877367502b58ec4f4cda2aa63a0c9b2a7c.