Fixed a compiler error on MSVC 2010

Change-Id: I68dea1bf3778a310f6ac59c58830ebce023fb65d
Merge branch 'compile-fix'

Change-Id: I7deac357ad1c3877bcd50beb2c0801181165d852