Merge "Switch Dumpstate HAL policy to _client/_server"