Add normalize flag. fix action of noresample flag.
Add normalize flag. fix action of noresample flag.


Former-commit-id: df0099f4c6e6cadff4f1000b5de2646c31b424ce [formerly 4927481c2757f0aee569cf9050a9a86e9a096ca9]
Former-commit-id: 2a8d1ea39724bd2a165687e253b6b0e04b693c44
jason-neal/eniric,jason-neal/eniric