Merge remote-tracking branch 'upstream/jb4.2' into jb4.2
Merge remote-tracking branch 'dennis/jb4.2' into kang