Merge from CM10

Change-Id: I7f96c3afd9922dd744d15144968d882540189e5c