Fixes after merge caf/jb chocolate

Change-Id: I8f807ba4797a37b0bdf527e9b30e31f615f0afec