Merge "Clear caller id when reading device config"