Merge remote-tracking branch 'caf/jb_2.6' into HEAD

Change-Id: I04929dc4fc14c0d1630c77259e78b78152ddf656