hackfest support

Change-Id: Ic382350077fd4ecfd80b3f25957d6dfac4031276