under visual studio c4334:
result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift
intended?)

Change-Id: If06793116ddfbe3265a17a17a2bcaa6ee8cf9e2d
(cherry picked from commit 535ecf6b31fe97f704f6725989cffad88ad960d8)