slight update with keyguard options

Change-Id: I8e29cfe279968256115f32e2509bb6466ca20a8f