Merge branch 'jb_mr2' of git://codeaurora.org/platform/hardware/ril into cm-10.2

Change-Id: Ic6f1409bc49d25339d7d21f920c9a5cb76f20c95