Fix for broken unit test on 32-bit platforms. Change-Id: Ie9c314b4ea14be2cb3e51c8b06374b22ffdf9200
Change-Id: Ie11b86821d34f6b93cd8d00c1709572d1a46e72b