Sync repo with CM

To be synced with the new features that will come, and for the new devices

Change-Id: Id1ce6c64aa825b85eb22a80938d5a93ac939a433
Merge "Sync repo with CM" into kk