Added conditional assembly to fold case for atom targets

Change-Id: Icfa1a92e0570607d46ee9810b6197e2278239acf