Solved conflicts:caf/jb_chocolate

Change-Id: I34a0902389f5c2e1b87bad0a22ca222a6118c98d