LockClock : Return condition code as part of query

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

Change-Id: I6960af3a339a36783b080c1cd0474421c1ac1f59
Automatic translation import

Change-Id: I1727fd4b4e9330876c5a948449e01db38fac53dd
Merge branch 'cm-11.0' into stable/cm-11.0
Automatic translation import

Change-Id: Ie172a7be92b325864a6a7c1e4b2f34aacff590d4
Automatic translation import

Change-Id: Ie172a7be92b325864a6a7c1e4b2f34aacff590d4
(cherry picked from commit 90ffdd06b8387b18aba99142e8c0df99c0de3cb6)
Merge branch 'cm-11.0' into stable/cm-11.0