Merge "Revert "[AAF] externalizes init data out from aaf-cass image to chart""