cLock: refactorings and cleanup (no functional changes)

Change-Id: I4ca0f3eea0cb3260f248d3abc6099b45c3ed1c27
Merge "cLock: refactorings and cleanup (no functional changes)" into cm-10.1
Change weather defaults.

Change-Id: I0937fd05f1f10535d135fe592764227320224180
Signed-off-by: Derek Cannata <thederekjay@gmail.com>