Merge "fixed issue in yardstick-img-modify cleanup() fun"