cLock: Latest merges

Change-Id: I15962a537fd89f27f2a3be773d80515b960f8824
Change weather defaults.

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