First working build

Change-Id: Ie50e9b3d0872933c81ff349af7516c6202d0aca4