Ready to compile

Change-Id: Ib851033956c86c6a4628cc9c377d2ada381e3dd4