Merge "Add transfer permission to wait_for_keymaster"