Building fix

Change-Id: I94b784cb38551ed14da83c5a28531133c8359ae1