Visual studio build fix using explicit cast

Change-Id: If74510370723e497f4f33d988b8b398124edf69b
Merge "Visual studio build fix using explicit cast"