merge caf/jb_mr1_chocolate

Change-Id: I35b0b06b4ffc2b4a3e0fa8cba3ab2c3f93f734f8