Fix version dependcy issue with hacking

Change-Id: I43f32a89689dc58da2ace0411ab5b88fe414b56f
Merge "Fix version dependcy issue with hacking"