Fixes for VS 2015 build.

Change-Id: I23280e611163a89b8eba7b9b0016c297fea2396e
2 files changed