Merge branch 'linux-3.0.y' into cm-10.1

Change-Id: I125a7f4b0275e7396a2b68eea6632d1e7bc50de3