Sync with cm-10.1 changes
Ville: fix confict with d2-common by only calling this for ville

Signed-off-by: travp624 <travp624@gmail.com>
Merge pull request #1 from klin1344/jb-4.2

Merge in changes from cm-10.1 branch