msm8660: Merge Derp

Change-Id: I4eebcc2bc415fc0ff21da989e8e297940df392cd