MB-12613_1 Fix compiler warnings and errors

Change-Id: Ib78bc6be0aa239483b3352d83fd6302e0f92b5e9