updating p3113 to p3110 for jb42 standardization
Merge remote-tracking branch 'upstream/jb-4.2' into jb-4.2