merge commits from cm device tree

Change-Id: I3a2ee6828ea510e964bede4cf09dedfe8ab778f3