Fix compile errors after merge jb_chocolate

Change-Id: I44db94baf93779e2e73b9f9e37f183029f7895ca