cm-10.1 comipiling errors fixed

Change-Id: Ib3fda25427b06e5afed34230466219853596dd32