device over rides common add common to device
Merge "device over rides common add common to device" into jb4.2