LockClock : Return condition code as part of query

Change-Id: Ide9be5cd181576e2f61927c5027cfa4724300b90
Merge branch 'cm-11.0' into stable/cm-11.0