Changes to hopefully fix build.

Change-Id: Ic81e07d75b3bc2ff629c907c4a9c7b752e5a2931