Update DTs in gcm_setup
for non-stock configs
#537
Merged
gcm_setup
for non-stock configs
#537