Merge: caf/jb_mr1_chocolate

Change-Id: I9c6a6929296d71369af41934da7df4e7c4be6ca2