Support for hackfest (initial)

Change-Id: I69db1bbfa0d6f79c7d0230d3e95aafe14195078f