0704141235 - Mergebot : Merge manual pull request from upstream source for device_samsung_smdk4412-common with the following commits: