Fix issues with bcm21553 merged board

Change-Id: I8fd5e3b157adba4f837c4083f80423f19eb3dc9d