Merge "fix gatekeper_device_test"