Squash CM-10.2 caf branch jb_2.6 merge

Change-Id: I122ab04ba0c5c946b0303127efca40755d9a0127