Fix for build breakage

Change-Id: I1d3daaa7d8ea060d06c2da0ad5c01971bb14a4f9