WIP: Parital build solution for error.

Change-Id: I90077c9ebb4679f56d5cbf3cc991c4f8f8d7a04e