Merge "Device config flag clean up."