Fix bug in fold generation
Fix bug in fold generation

Change-Id: I775822a9282c2c890e8f8ef275002dd305ad18b8

apmasell/flabbergast,apmasell/flabbergast,apmasell/flabbergast,apmasell/flabbergast,apmasell/flabbergast,flabbergast-config/flabbergast,flabbergast-config/flabbergast,flabbergast-config/flabbergast,flabbergast-config/flabbergast,apmasell/flabbergast,flabbergast-config/flabbergast