cLock: Latest merges

Change-Id: I15962a537fd89f27f2a3be773d80515b960f8824
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1