Build and tests were failing because of the following card -
https://trello.com/c/XbYIRkSg. Fixed.

Change-Id: I1755857394c2f47843a09bab9672b19c0f4002d4