cLock: Better OOBE

Change-Id: I3939ce9123acf7d12f18dd0dc6fc3a17c8cbf546
Merge branch 'cm-10.2' into martincz