Fix build

*bad merge :/

Change-Id: I535cf64a911bb5746fc70f736c414a8470a3f041