Pulled fix from cm12 branch.