Ready to compile

Change-Id: Ia77276cfc39a0c036e39a599fa17ba0efd034376