cLock: Forward port CM10.2 updates

Change-Id: Icec530485324193f76ac7bfe48ca5ca179bd0b7b
Merge branch 'cm-11.0' into martincz