#10446 Fixed errors from Mana's commits for newer compilers TESTS_RAN: Build
#10446 Fixed errors from Mana's commits for newer compilers
TESTS_RAN: Build



git-svn-id: 19922234b302d9c4732de4f61656cc2fd4e4fa2a@1579 01a69087-22d5-4a29-8152-8a1d5e10e5e9

SanDisk-Open-Source/zetascale,SanDisk-Open-Source/zetascale,SanDisk-Open-Source/zetascale,SanDisk-Open-Source/zetascale,SanDisk-Open-Source/zetascale