more changes to cm from aosp

Change-Id: Ic55dd8c333fd47276f9b24f27d828ee61706ed02