1) One more place in desktop that missed the LOK_TEST check.

2) One testcase currently fails on baseline, disabled for now, need to
check later.

Change-Id: I8c8bcf2cec1618e39e8453120755dffd3feb79ce